projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ebe23b7) | patch
(smerge-ediff): Autoload.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Oct 2002 17:30:20 +0000 (17:30 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Oct 2002 17:30:20 +0000 (17:30 +0000)
commit918368c51abaec58b9453333ca43c9e9bd9ff1ee
tree266f4770e789d1cac61173deb5e9ce122274c143tree | snapshot
parentebe23b72898bcc7c1c91cbba35b256d9c450721bcommit | diff
(smerge-ediff): Autoload.
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.